UI enhancements